home *** CD-ROM | disk | FTP | other *** search
- Path: uunet!zephyr.ens.tek.com!tekgen!tekred!saab!billr
- From: billr@saab.CNA.TEK.COM (Bill Randle)
- Newsgroups: comp.sources.games
- Subject: v08i030: GB2 - Galactic Bloodshed, an empire-like war game [Ver. 1.0], Patch2
- Message-ID: <4587@tekred.CNA.TEK.COM>
- Date: 18 Sep 89 13:30:26 GMT
- Sender: news@tekred.CNA.TEK.COM
- Lines: 284
- Approved: billr@saab.CNA.TEK.COM
-
- Submitted-by: VANCLEEF@ohstpy.mps.ohio-state.edu
- Posting-number: Volume 8, Issue 30
- Archive-name: GB2/Patch2
- Patch-To: GB2: Volume 7, Issue 44-51
-
- [This corrects a sprintf bug in doplanet.c and updates the
- Makefile properly (the previous patch was completely wrong).
- -br]
-
- #! /bin/sh
- # This is a shell archive. Remove anything before this line, then unpack
- # it by saving it into a file and typing "sh file". To overwrite existing
- # files, type "sh file -c". You can also feed this as standard input via
- # unshar, or by typing "sh <file", e.g.. If this archive is complete, you
- # will see the following message at the end:
- # "End of shell archive."
- # Contents: patches02
- # Wrapped by billr@saab on Mon Sep 18 06:37:05 1989
- PATH=/bin:/usr/bin:/usr/ucb ; export PATH
- if test -f 'patches02' -a "${1}" != "-c" ; then
- echo shar: Will not clobber existing file \"'patches02'\"
- else
- echo shar: Extracting \"'patches02'\" \(6133 characters\)
- sed "s/^X//" >'patches02' <<'END_OF_FILE'
- X*** ../../GB2/doplanet.c Fri Sep 15 08:44:12 1989
- X--- doplanet.c Mon Sep 18 06:19:27 1989
- X***************
- X*** 332,338 ****
- X
- X while (Getxysect(planet, &x, &y, 0)) {
- X p = &Sector(*planet,x,y);
- X-
- X if (p->amoeba) {
- X planet->info[1-1].numsectsowned++;
- X allamoeba &= 1;
- X--- 332,337 ----
- X***************
- X*** 608,613 ****
- X--- 607,613 ----
- X /* deal with enslaved planets */
- X if (planet->slaved_to) {
- X if (populations[planet->slaved_to] >= planet->popn * 0.001) {
- X+ printf("enslaved!\n");
- X for (i=1; i<=Num_races; i++)
- X /* add production to slave holder of planet */
- X if (planet->info[i-1].numsectsowned) {
- X***************
- X*** 620,631 ****
- X }
- X } else {
- X /* slave revolt! */
- X!
- X /* first nuke some random sectors from the revolt */
- X i = planet->popn / 10000 + 1;
- X while (--i) {
- X! p = &Sector(*planet,int_rand(0,planet->Maxx),
- X! int_rand(0,planet->Maxy));
- X if (p->popn) {
- X p->owner = p->popn = 0;
- X p->is_wasted = 1;
- X--- 620,632 ----
- X }
- X } else {
- X /* slave revolt! */
- X! printf("slave revolt!\n");
- X /* first nuke some random sectors from the revolt */
- X i = planet->popn / 10000 + 1;
- X+ printf("i %d Maxx %d Maxy %d\n",i,planet->Maxx,planet->Maxy);
- X while (--i) {
- X! p = &Sector(*planet,int_rand(0,planet->Maxx-1),
- X! int_rand(0,planet->Maxy-1));
- X if (p->popn) {
- X p->owner = p->popn = 0;
- X p->is_wasted = 1;
- X***************
- X*** 636,642 ****
- X while (Getxysect(planet, &x, &y, 0)) {
- X p = &Sector(*planet,x,y);
- X if (p->owner==planet->slaved_to) {
- X! p->owner = p->popn = 0;
- X p->is_wasted = 1;
- X }
- X }
- X--- 637,644 ----
- X while (Getxysect(planet, &x, &y, 0)) {
- X p = &Sector(*planet,x,y);
- X if (p->owner==planet->slaved_to) {
- X! p->owner = 0;
- X! p->popn = 0;
- X p->is_wasted = 1;
- X }
- X }
- X***************
- X*** 647,653 ****
- X teleg_add(buf, telegram_buf);
- X teleg_add("\nThere has been a SLAVE REVOLT on this planet!\n",
- X telegram_buf);
- X! sprintf(buf,"%s on the planet have all been killed!\n");
- X teleg_add(buf,telegram_buf);
- X teleg_add("Productions now go to their rightful owners.\n",
- X telegram_buf);
- X--- 649,655 ----
- X teleg_add(buf, telegram_buf);
- X teleg_add("\nThere has been a SLAVE REVOLT on this planet!\n",
- X telegram_buf);
- X! sprintf(buf,"All population belonging to player #%d on the planet have been killed!\n",planet->slaved_to);
- X teleg_add(buf,telegram_buf);
- X teleg_add("Productions now go to their rightful owners.\n",
- X telegram_buf);
- X*** ../../GB2/Makefile Fri Sep 15 08:44:04 1989
- X--- Makefile Mon Sep 18 06:27:58 1989
- X***************
- X*** 1,5 ****
- X # Galactic Bloodshed (Robert Chansky, smq@b)
- X! # Makefile
- X
- X # what version of UNIX we are running on.
- X UV = VER_4_3
- X--- 1,5 ----
- X # Galactic Bloodshed (Robert Chansky, smq@b)
- X! # Makefile (modified by billr@saab.cna.tek.com, 4/26/89)
- X
- X # what version of UNIX we are running on.
- X UV = VER_4_3
- X***************
- X*** 6,13 ****
- X #UV = VER_4_2
- X # You might want to get rid of the -pipe -g, since these are for development.
- X CFLAGS = -D$(UV) -pipe -g
- X! #-D$(UV) -O
- X
- X # objects for shell
- X SHOBJS = getplace.o \
- X read_teleg.o \
- X--- 6,19 ----
- X #UV = VER_4_2
- X # You might want to get rid of the -pipe -g, since these are for development.
- X CFLAGS = -D$(UV) -pipe -g
- X! #CFLAGS = -D$(UV) -g
- X! #CFLAGS = -D$(UV) -O
- X
- X+ # destination directories
- X+ # GLIB should match the directory in the PATH macro of files.h
- X+ GBIN = /usr/games
- X+ GLIB = /usr/games/lib/GB
- X+
- X # objects for shell
- X SHOBJS = getplace.o \
- X read_teleg.o \
- X***************
- X*** 14,19 ****
- X--- 20,26 ----
- X autoreport.o \
- X shootblast.o \
- X docommand.o \
- X+ explore.o \
- X telegram.o \
- X mobiliz.o \
- X shlmisc.o \
- X***************
- X*** 23,28 ****
- X--- 30,36 ----
- X autoshoot.o \
- X dosector.o \
- X relation.o \
- X+ enslave.o \
- X doturn.o \
- X doship.o \
- X zoom.o \
- X***************
- X*** 77,82 ****
- X--- 85,92 ----
- X makeplanet.o \
- X shootblast.o \
- X autoshoot.o \
- X+ moveship.o \
- X+ explore.o \
- X relation.o \
- X dosector.o \
- X declare.o \
- X***************
- X*** 104,109 ****
- X--- 114,120 ----
- X shootblast.o \
- X makeplanet.o \
- X examine.o \
- X+ enslave.o \
- X launch.o \
- X build.o \
- X order.o \
- X***************
- X*** 179,188 ****
- X ${VOBJS}: vars.h
- X ${SHIPOBJS}: vars.h ships.h
- X ${FOBJS}: files.h
- X moveship.o : vars.h ships.h shipdata.h
- X doturn.o doplanet.o power.o doship.o files_shl.o makeuniv.o : power.h
- X #sizes : vars.h ships.h races.h
- X! # cc sizes.c
- X
- X
- X # make data files program
- X--- 190,200 ----
- X ${VOBJS}: vars.h
- X ${SHIPOBJS}: vars.h ships.h
- X ${FOBJS}: files.h
- X+ ${NOOBJS}: tweakables.h
- X moveship.o : vars.h ships.h shipdata.h
- X doturn.o doplanet.o power.o doship.o files_shl.o makeuniv.o : power.h
- X #sizes : vars.h ships.h races.h
- X! # sizes.c
- X
- X
- X # make data files program
- X***************
- X*** 193,199 ****
- X # the daemon
- X GB_daemon : ${DOBJS}
- X cc -o GB_daemon ${DOBJS} -lm
- X! doturn.o doship.o doplanet.o : doturn.h
- X
- X # more clone
- X mor : more.c
- X--- 205,211 ----
- X # the daemon
- X GB_daemon : ${DOBJS}
- X cc -o GB_daemon ${DOBJS} -lm
- X! doturn.o doship.o doplanet.o moveship.o moveplanet.o : doturn.h
- X
- X # more clone
- X mor : more.c
- X***************
- X*** 200,205 ****
- X--- 212,218 ----
- X cc -o mor more.c
- X
- X chmod:
- X+ cd $(GLIB)
- X chmod ag+xs GB
- X chmod g+rwx Data Data/* Data/Tele/*
- X chmod a+rx Docs Docs/*
- X***************
- X*** 208,213 ****
- X--- 221,227 ----
- X # chmod ga+rwx Data Data/* Data/Tele/*
- X
- X start:
- X+ cd $(GLIB)
- X /bin/rm -f Data/spitup
- X GB_daemon \>\& Data/spitup
- X
- X***************
- X*** 244,252 ****
- X # install the game for public use.
- X install:
- X make
- X! mkdir Docs
- X! mv *.doc Docs
- X! compress Docs/* enroll.dat
- X makeuniv < planet.list
- X make chmod
- X
- X--- 258,270 ----
- X # install the game for public use.
- X install:
- X make
- X! cp GB $(GBIN)
- X! -mkdir $(GLIB)
- X! cp exam.dat enroll.dat $(GLIB)
- X! -mkdir $(GLIB)/Docs
- X! -cp Docs/* $(GLIB)/Docs
- X! -compress $(GLIB)/Docs/* $(GLIB)/enroll.dat
- X! make clear
- X makeuniv < planet.list
- X make chmod
- X
- END_OF_FILE
- if test 6133 -ne `wc -c <'patches02'`; then
- echo shar: \"'patches02'\" unpacked with wrong size!
- fi
- # end of 'patches02'
- fi
- echo shar: End of shell archive.
- exit 0
-